From 5ceb29140b9d878717dc880e7754e9c695d2b0e1 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 25 Aug 2009 10:24:25 +0000 Subject: [PATCH] * net/tramp-gvfs.el (top): Use timeout of 100 msec pinging GVFS daemon. Replace ping by checking for running service for bluez and zeroconf. (Bug#4239) --- lisp/net/tramp-gvfs.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 3091197cad8..8ef65459cb7 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -144,7 +144,7 @@ "The well known name of the GVFS daemon.") ;; Check that GVFS is available. -(unless (dbus-ping :session tramp-gvfs-service-daemon) +(unless (dbus-ping :session tramp-gvfs-service-daemon 100) (throw 'tramp-loading nil)) (defconst tramp-gvfs-path-mounttracker "/org/gtk/vfs/mounttracker" @@ -1177,7 +1177,7 @@ be used." (tramp-bluez-list-devices))) ;; Add completion function for OBEX method. -(when (dbus-ping :system tramp-bluez-service) +(when (member tramp-bluez-service (dbus-list-known-names :system)) (tramp-set-completion-function "obex" '((tramp-bluez-parse-device-names "")))) @@ -1210,7 +1210,7 @@ be used." (zeroconf-list-services "_webdav._tcp"))) ;; Add completion function for DAV and DAVS methods. -(when (dbus-ping :system zeroconf-service-avahi) +(when (member zeroconf-service-avahi (dbus-list-known-names :system)) (zeroconf-init tramp-gvfs-zeroconf-domain) (tramp-set-completion-function "sftp" '((tramp-zeroconf-parse-workstation-device-names ""))) -- 2.30.2